From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 1 Nov 2010 13:42:29 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~15785^2~23^2~133
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f2a630bfeccc87c3f89aaf8b4a8902f1e4e9f7ca;p=linux-4.9.git

Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/i915_gem_evict.c
---

f2a630bfeccc87c3f89aaf8b4a8902f1e4e9f7ca